from trunk
authorKenichi Handa <handa@m17n.org>
Thu, 21 Jan 2010 04:14:47 +0000 (13:14 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 21 Jan 2010 04:14:47 +0000 (13:14 +0900)

Trivial merge